Autogenerated HTML docs for v1.6.3-rc0-53-g1a1f0
diff --git a/cmds-ancillaryinterrogators.txt b/cmds-ancillaryinterrogators.txt index 037468b..b5e61f1 100644 --- a/cmds-ancillaryinterrogators.txt +++ b/cmds-ancillaryinterrogators.txt
@@ -10,6 +10,9 @@ linkgit:git-count-objects[1]:: Count unpacked number of objects and their disk consumption. +linkgit:git-difftool[1]:: + Show changes using common diff tools. + linkgit:git-fsck[1]:: Verifies the connectivity and validity of the objects in the database.
diff --git a/config.txt b/config.txt index f3ebd2f..5319df5 100644 --- a/config.txt +++ b/config.txt
@@ -667,6 +667,27 @@ A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false. +diff.tool:: + Controls which diff tool is used. `diff.tool` overrides + `merge.tool` when used by linkgit:git-difftool[1] and has + the same valid values as `merge.tool` minus "tortoisemerge" + and plus "kompare". + +difftool.<tool>.path:: + Override the path for the given tool. This is useful in case + your tool is not in the PATH. + +difftool.<tool>.cmd:: + Specify the command to invoke the specified diff tool. + The specified command is evaluated in shell with the following + variables available: 'LOCAL' is set to the name of the temporary + file containing the contents of the diff pre-image and 'REMOTE' + is set to the name of the temporary file containing the contents + of the diff post-image. + +difftool.prompt:: + Prompt before each invocation of the diff tool. + diff.wordRegex:: A POSIX Extended Regular Expression used to determine what is a "word" when performing word-by-word difference calculations. Character
diff --git a/git-add.html b/git-add.html index 068f66f..b9e2a8c 100644 --- a/git-add.html +++ b/git-add.html
@@ -647,8 +647,11 @@ <div class="content"> <pre><tt>y - stage this hunk n - do not stage this hunk +q - quit, do not stage this hunk nor any of the remaining ones a - stage this and all the remaining hunks in the file d - do not stage this hunk nor any of the remaining hunks in the file +g - select a hunk to go to +/ - search for a hunk matching the given regex j - leave this hunk undecided, see next undecided hunk J - leave this hunk undecided, see next hunk k - leave this hunk undecided, see previous undecided hunk @@ -694,7 +697,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-02 06:49:44 UTC +Last updated 2009-04-18 06:17:30 UTC </div> </div> </body>
diff --git a/git-add.txt b/git-add.txt index ce71838..d938b42 100644 --- a/git-add.txt +++ b/git-add.txt
@@ -245,8 +245,11 @@ y - stage this hunk n - do not stage this hunk + q - quit, do not stage this hunk nor any of the remaining ones a - stage this and all the remaining hunks in the file d - do not stage this hunk nor any of the remaining hunks in the file + g - select a hunk to go to + / - search for a hunk matching the given regex j - leave this hunk undecided, see next undecided hunk J - leave this hunk undecided, see next hunk k - leave this hunk undecided, see previous undecided hunk
diff --git a/git-branch.html b/git-branch.html index ec87176..b132aff 100644 --- a/git-branch.html +++ b/git-branch.html
@@ -488,24 +488,26 @@ </dt> <dd> <p> - When creating a new branch, set up the configuration so that <em>git-pull</em> - will automatically retrieve data from the start point, which must be - a branch. Use this if you always pull from the same upstream branch - into the new branch, and if you do not want to use "git pull - <repository> <refspec>" explicitly. This behavior is the default - when the start point is a remote branch. Set the - branch.autosetupmerge configuration variable to <tt>false</tt> if you want - <em>git-checkout</em> and <em>git-branch</em> to always behave as if <em>--no-track</em> were - given. Set it to <tt>always</tt> if you want this behavior when the - start-point is either a local or remote branch. + When creating a new branch, set up configuration to mark the + start-point branch as "upstream" from the new branch. This + configuration will tell git to show the relationship between the + two branches in <tt>git status</tt> and <tt>git branch -v</tt>. Furthermore, + it directs <tt>git pull</tt> without arguments to pull from the + upstream when the new branch is checked out. </p> +<div class="para"><p>This behavior is the default when the start point is a remote branch. +Set the branch.autosetupmerge configuration variable to <tt>false</tt> if you +want <tt>git checkout</tt> and <tt>git branch</tt> to always behave as if <em>--no-track</em> +were given. Set it to <tt>always</tt> if you want this behavior when the +start-point is either a local or remote branch.</p></div> </dd> <dt> --no-track </dt> <dd> <p> - Ignore the branch.autosetupmerge configuration variable. + Do not set up "upstream" configuration, even if the + branch.autosetupmerge configuration variable is true. </p> </dd> <dt> @@ -667,7 +669,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-13 02:39:28 UTC +Last updated 2009-04-18 06:17:30 UTC </div> </div> </body>
diff --git a/git-branch.txt b/git-branch.txt index ba3dea6..cbd4275 100644 --- a/git-branch.txt +++ b/git-branch.txt
@@ -112,19 +112,22 @@ Display the full sha1s in the output listing rather than abbreviating them. --track:: - When creating a new branch, set up the configuration so that 'git-pull' - will automatically retrieve data from the start point, which must be - a branch. Use this if you always pull from the same upstream branch - into the new branch, and if you do not want to use "git pull - <repository> <refspec>" explicitly. This behavior is the default - when the start point is a remote branch. Set the - branch.autosetupmerge configuration variable to `false` if you want - 'git-checkout' and 'git-branch' to always behave as if '--no-track' were - given. Set it to `always` if you want this behavior when the - start-point is either a local or remote branch. + When creating a new branch, set up configuration to mark the + start-point branch as "upstream" from the new branch. This + configuration will tell git to show the relationship between the + two branches in `git status` and `git branch -v`. Furthermore, + it directs `git pull` without arguments to pull from the + upstream when the new branch is checked out. ++ +This behavior is the default when the start point is a remote branch. +Set the branch.autosetupmerge configuration variable to `false` if you +want `git checkout` and `git branch` to always behave as if '--no-track' +were given. Set it to `always` if you want this behavior when the +start-point is either a local or remote branch. --no-track:: - Ignore the branch.autosetupmerge configuration variable. + Do not set up "upstream" configuration, even if the + branch.autosetupmerge configuration variable is true. --contains <commit>:: Only list branches which contain the specified commit.
diff --git a/git-checkout.html b/git-checkout.html index 631847d..d58a867 100644 --- a/git-checkout.html +++ b/git-checkout.html
@@ -321,20 +321,20 @@ <h2>SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git checkout</em> [-q] [-f] [-t | --track | --no-track] [-b <new_branch> [-l]] [-m] [<branch>] +<div class="content"><em>git checkout</em> [-q] [-f] [-m] [<branch>] +<em>git checkout</em> [-q] [-f] [-m] [-b <new_branch>] [<start_point>] <em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>…</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> <div class="para"><p>When <paths> are not given, this command switches branches by -updating the index and working tree to reflect the specified -branch, <branch>, and updating HEAD to be <branch> or, if -specified, <new_branch>. Using -b will cause <new_branch> to -be created; in this case you can use the --track or --no-track -options, which will be passed to <tt>git branch</tt>.</p></div> -<div class="para"><p>As a convenience, --track will default to creating a branch whose -name is constructed from the specified branch name by stripping -the first namespace level.</p></div> +updating the index, working tree, and HEAD to reflect the specified +branch.</p></div> +<div class="para"><p>If <tt>-b</tt> is given, a new branch is created and checked out, as if +<a href="git-branch.html">git-branch(1)</a> were called; in this case you can +use the --track or --no-track options, which will be passed to <tt>git +branch</tt>. As a convenience, --track without <tt>-b</tt> implies branch +creation; see the description of --track below.</p></div> <div class="para"><p>When <paths> are given, this command does <strong>not</strong> switch branches. It updates the named paths in the working tree from the index file, or from a named <tree-ish> (most often a commit). In @@ -392,9 +392,7 @@ <dd> <p> Create a new branch named <new_branch> and start it at - <branch>. The new branch name must pass all checks defined - by <a href="git-check-ref-format.html">git-check-ref-format(1)</a>. Some of these checks - may restrict the characters allowed in a branch name. + <start_point>; see <a href="git-branch.html">git-branch(1)</a> for details. </p> </dd> <dt> @@ -405,16 +403,8 @@ </dt> <dd> <p> - When creating a new branch, set up configuration so that <em>git-pull</em> - will automatically retrieve data from the start point, which must be - a branch. Use this if you always pull from the same upstream branch - into the new branch, and if you don't want to use "git pull - <repository> <refspec>" explicitly. This behavior is the default - when the start point is a remote branch. Set the - branch.autosetupmerge configuration variable to <tt>false</tt> if you want - <em>git checkout</em> and <em>git branch</em> to always behave as if <em>--no-track</em> were - given. Set it to <tt>always</tt> if you want this behavior when the - start point is either a local or remote branch. + When creating a new branch, set up "upstream" configuration. See + "--track" in <a href="git-branch.html">git-branch(1)</a> for details. </p> <div class="para"><p>If no <em>-b</em> option is given, the name of the new branch will be derived from the remote branch. If "remotes/" or "refs/remotes/" @@ -431,7 +421,8 @@ </dt> <dd> <p> - Ignore the branch.autosetupmerge configuration variable. + Do not set up "upstream" configuration, even if the + branch.autosetupmerge configuration variable is true. </p> </dd> <dt> @@ -439,9 +430,8 @@ </dt> <dd> <p> - Create the new branch's reflog. This activates recording of - all changes made to the branch ref, enabling use of date - based sha1 expressions such as "<branchname>@{yesterday}". + Create the new branch's reflog; see <a href="git-branch.html">git-branch(1)</a> for + details. </p> </dd> <dt> @@ -481,6 +471,21 @@ </p> </dd> <dt> +<branch> +</dt> +<dd> +<p> + Branch to checkout; if it refers to a branch (i.e., a name that, + when prepended with "refs/heads/", is a valid ref), then that + branch is checked out. Otherwise, if it refers to a valid + commit, your HEAD becomes "detached" and you are no longer on + any branch (see below for details). +</p> +<div class="para"><p>As a special case, the <tt>"@{-N}"</tt> syntax for the N-th last branch +checks out the branch (instead of detaching). You may also specify +<tt>-</tt> which is synonymous with <tt>"@{-1}"</tt>.</p></div> +</dd> +<dt> <new_branch> </dt> <dd> @@ -489,6 +494,15 @@ </p> </dd> <dt> +<start_point> +</dt> +<dd> +<p> + The name of a commit at which to start the new branch; see + <a href="git-branch.html">git-branch(1)</a> for details. Defaults to HEAD. +</p> +</dd> +<dt> <tree-ish> </dt> <dd> @@ -497,20 +511,6 @@ the index will be used. </p> </dd> -<dt> -<branch> -</dt> -<dd> -<p> - Branch to checkout (when no paths are given); may be any object - ID that resolves to a commit. Defaults to HEAD. -</p> -<div class="para"><p>When this parameter names a non-branch (but still a valid commit object), -your HEAD becomes <em>detached</em>.</p></div> -<div class="para"><p>As a special case, the <tt>"@{-N}"</tt> syntax for the N-th last branch -checks out the branch (instead of detaching). You may also specify -<tt>-</tt> which is synonymous with <tt>"@{-1}"</tt>.</p></div> -</dd> </dl></div> </div> <h2 id="_detached_head">Detached HEAD</h2> @@ -652,7 +652,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-08 07:36:11 UTC +Last updated 2009-04-18 06:17:30 UTC </div> </div> </body> diff --git a/git-checkout.txt b/git-checkout.txt index 223ea9c..ad4b31e 100644 --- a/git-checkout.txt +++ b/git-checkout.txt
@@ -8,22 +8,22 @@ SYNOPSIS -------- [verse] -'git checkout' [-q] [-f] [-t | --track | --no-track] [-b <new_branch> [-l]] [-m] [<branch>] +'git checkout' [-q] [-f] [-m] [<branch>] +'git checkout' [-q] [-f] [-m] [-b <new_branch>] [<start_point>] 'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>... DESCRIPTION ----------- When <paths> are not given, this command switches branches by -updating the index and working tree to reflect the specified -branch, <branch>, and updating HEAD to be <branch> or, if -specified, <new_branch>. Using -b will cause <new_branch> to -be created; in this case you can use the --track or --no-track -options, which will be passed to `git branch`. +updating the index, working tree, and HEAD to reflect the specified +branch. -As a convenience, --track will default to creating a branch whose -name is constructed from the specified branch name by stripping -the first namespace level. +If `-b` is given, a new branch is created and checked out, as if +linkgit:git-branch[1] were called; in this case you can +use the --track or --no-track options, which will be passed to `git +branch`. As a convenience, --track without `-b` implies branch +creation; see the description of --track below. When <paths> are given, this command does *not* switch branches. It updates the named paths in the working tree from @@ -62,22 +62,12 @@ -b:: Create a new branch named <new_branch> and start it at - <branch>. The new branch name must pass all checks defined - by linkgit:git-check-ref-format[1]. Some of these checks - may restrict the characters allowed in a branch name. + <start_point>; see linkgit:git-branch[1] for details. -t:: --track:: - When creating a new branch, set up configuration so that 'git-pull' - will automatically retrieve data from the start point, which must be - a branch. Use this if you always pull from the same upstream branch - into the new branch, and if you don't want to use "git pull - <repository> <refspec>" explicitly. This behavior is the default - when the start point is a remote branch. Set the - branch.autosetupmerge configuration variable to `false` if you want - 'git checkout' and 'git branch' to always behave as if '--no-track' were - given. Set it to `always` if you want this behavior when the - start point is either a local or remote branch. + When creating a new branch, set up "upstream" configuration. See + "--track" in linkgit:git-branch[1] for details. + If no '-b' option is given, the name of the new branch will be derived from the remote branch. If "remotes/" or "refs/remotes/" @@ -90,12 +80,12 @@ explicitly give a name with '-b' in such a case. --no-track:: - Ignore the branch.autosetupmerge configuration variable. + Do not set up "upstream" configuration, even if the + branch.autosetupmerge configuration variable is true. -l:: - Create the new branch's reflog. This activates recording of - all changes made to the branch ref, enabling use of date - based sha1 expressions such as "<branchname>@\{yesterday}". + Create the new branch's reflog; see linkgit:git-branch[1] for + details. -m:: --merge:: @@ -123,23 +113,28 @@ "merge" (default) and "diff3" (in addition to what is shown by "merge" style, shows the original contents). +<branch>:: + Branch to checkout; if it refers to a branch (i.e., a name that, + when prepended with "refs/heads/", is a valid ref), then that + branch is checked out. Otherwise, if it refers to a valid + commit, your HEAD becomes "detached" and you are no longer on + any branch (see below for details). ++ +As a special case, the `"@\{-N\}"` syntax for the N-th last branch +checks out the branch (instead of detaching). You may also specify +`-` which is synonymous with `"@\{-1\}"`. + <new_branch>:: Name for the new branch. +<start_point>:: + The name of a commit at which to start the new branch; see + linkgit:git-branch[1] for details. Defaults to HEAD. + <tree-ish>:: Tree to checkout from (when paths are given). If not specified, the index will be used. -<branch>:: - Branch to checkout (when no paths are given); may be any object - ID that resolves to a commit. Defaults to HEAD. -+ -When this parameter names a non-branch (but still a valid commit object), -your HEAD becomes 'detached'. -+ -As a special case, the `"@\{-N\}"` syntax for the N-th last branch -checks out the branch (instead of detaching). You may also specify -`-` which is synonymous with `"@\{-1\}"`. Detached HEAD diff --git a/git-config.html b/git-config.html index 69fbefe..5b338e4 100644 --- a/git-config.html +++ b/git-config.html
@@ -1750,6 +1750,47 @@ </p> </dd> <dt> +diff.tool +</dt> +<dd> +<p> + Controls which diff tool is used. <tt>diff.tool</tt> overrides + <tt>merge.tool</tt> when used by <a href="git-difftool.html">git-difftool(1)</a> and has + the same valid values as <tt>merge.tool</tt> minus "tortoisemerge" + and plus "kompare". +</p> +</dd> +<dt> +difftool.<tool>.path +</dt> +<dd> +<p> + Override the path for the given tool. This is useful in case + your tool is not in the PATH. +</p> +</dd> +<dt> +difftool.<tool>.cmd +</dt> +<dd> +<p> + Specify the command to invoke the specified diff tool. + The specified command is evaluated in shell with the following + variables available: <em>LOCAL</em> is set to the name of the temporary + file containing the contents of the diff pre-image and <em>REMOTE</em> + is set to the name of the temporary file containing the contents + of the diff post-image. +</p> +</dd> +<dt> +difftool.prompt +</dt> +<dd> +<p> + Prompt before each invocation of the diff tool. +</p> +</dd> +<dt> diff.wordRegex </dt> <dd> @@ -2586,7 +2627,8 @@ <p> Controls which merge resolution program is used by <a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3", - "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and + "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", + "diffuse", "ecmerge", "tortoisemerge", and "opendiff". Any other value is treated is custom merge tool and there must be a corresponding mergetool.<tool>.cmd option. </p> @@ -3219,7 +3261,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-13 02:39:28 UTC +Last updated 2009-04-18 06:17:30 UTC </div> </div> </body>
diff --git a/git-difftool.html b/git-difftool.html new file mode 100644 index 0000000..691108d --- /dev/null +++ b/git-difftool.html
@@ -0,0 +1,481 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> +<style type="text/css"> +/* Debug borders */ +p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { +/* + border: 1px solid red; +*/ +} + +body { + margin: 1em 5% 1em 5%; +} + +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} + +em { + font-style: italic; +} + +strong { + font-weight: bold; +} + +tt { + color: navy; +} + +h1, h2, h3, h4, h5, h6 { + color: #527bbd; + font-family: sans-serif; + margin-top: 1.2em; + margin-bottom: 0.5em; + line-height: 1.3; +} + +h1, h2, h3 { + border-bottom: 2px solid silver; +} +h2 { + padding-top: 0.5em; +} +h3 { + float: left; +} +h3 + * { + clear: left; +} + +div.sectionbody { + font-family: serif; + margin-left: 0; +} + +hr { + border: 1px solid silver; +} + +p { + margin-top: 0.5em; + margin-bottom: 0.5em; +} + +pre { + padding: 0; + margin: 0; +} + +span#author { + color: #527bbd; + font-family: sans-serif; + font-weight: bold; + font-size: 1.1em; +} +span#email { +} +span#revision { + font-family: sans-serif; +} + +div#footer { + font-family: sans-serif; + font-size: small; + border-top: 2px solid silver; + padding-top: 0.5em; + margin-top: 4.0em; +} +div#footer-text { + float: left; + padding-bottom: 0.5em; +} +div#footer-badges { + float: right; + padding-bottom: 0.5em; +} + +div#preamble, +div.tableblock, div.imageblock, div.exampleblock, div.verseblock, +div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, +div.admonitionblock { + margin-right: 10%; + margin-top: 1.5em; + margin-bottom: 1.5em; +} +div.admonitionblock { + margin-top: 2.5em; + margin-bottom: 2.5em; +} + +div.content { /* Block element content. */ + padding: 0; +} + +/* Block element titles. */ +div.title, caption.title { + font-family: sans-serif; + font-weight: bold; + text-align: left; + margin-top: 1.0em; + margin-bottom: 0.5em; +} +div.title + * { + margin-top: 0; +} + +td div.title:first-child { + margin-top: 0.0em; +} +div.content div.title:first-child { + margin-top: 0.0em; +} +div.content + div.title { + margin-top: 0.0em; +} + +div.sidebarblock > div.content { + background: #ffffee; + border: 1px solid silver; + padding: 0.5em; +} + +div.listingblock { + margin-right: 0%; +} +div.listingblock > div.content { + border: 1px solid silver; + background: #f4f4f4; + padding: 0.5em; +} + +div.quoteblock > div.content { + padding-left: 2.0em; +} + +div.attribution { + text-align: right; +} +div.verseblock + div.attribution { + text-align: left; +} + +div.admonitionblock .icon { + vertical-align: top; + font-size: 1.1em; + font-weight: bold; + text-decoration: underline; + color: #527bbd; + padding-right: 0.5em; +} +div.admonitionblock td.content { + padding-left: 0.5em; + border-left: 2px solid silver; +} + +div.exampleblock > div.content { + border-left: 2px solid silver; + padding: 0.5em; +} + +div.verseblock div.content { + white-space: pre; +} + +div.imageblock div.content { padding-left: 0; } +div.imageblock img { border: 1px solid silver; } +span.image img { border-style: none; } + +dl { + margin-top: 0.8em; + margin-bottom: 0.8em; +} +dt { + margin-top: 0.5em; + margin-bottom: 0; + font-style: italic; +} +dd > *:first-child { + margin-top: 0; +} + +ul, ol { + list-style-position: outside; +} +div.olist2 ol { + list-style-type: lower-alpha; +} + +div.tableblock > table { + border: 3px solid #527bbd; +} +thead { + font-family: sans-serif; + font-weight: bold; +} +tfoot { + font-weight: bold; +} + +div.hlist { + margin-top: 0.8em; + margin-bottom: 0.8em; +} +div.hlist td { + padding-bottom: 5px; +} +td.hlist1 { + vertical-align: top; + font-style: italic; + padding-right: 0.8em; +} +td.hlist2 { + vertical-align: top; +} + +@media print { + div#footer-badges { display: none; } +} + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] +/* Workarounds for IE6's broken and incomplete CSS2. */ + +div.sidebar-content { + background: #ffffee; + border: 1px solid silver; + padding: 0.5em; +} +div.sidebar-title, div.image-title { + font-family: sans-serif; + font-weight: bold; + margin-top: 0.0em; + margin-bottom: 0.5em; +} + +div.listingblock div.content { + border: 1px solid silver; + background: #f4f4f4; + padding: 0.5em; +} + +div.quoteblock-content { + padding-left: 2.0em; +} + +div.exampleblock-content { + border-left: 2px solid silver; + padding-left: 0.5em; +} + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } +</style> +<title>git-difftool(1)</title> +</head> +<body> +<div id="header"> +<h1> +git-difftool(1) Manual Page +</h1> +<h2>NAME</h2> +<div class="sectionbody"> +<p>git-difftool - + Show changes using common diff tools +</p> +</div> +</div> +<h2>SYNOPSIS</h2> +<div class="sectionbody"> +<div class="para"><p><em>git difftool</em> [--tool=<tool>] [-y|--no-prompt|--prompt] [<<em>git diff</em> options>]</p></div> +</div> +<h2 id="_description">DESCRIPTION</h2> +<div class="sectionbody"> +<div class="para"><p><em>git-difftool</em> is a git command that allows you to compare and edit files +between revisions using common diff tools. <em>git difftool</em> is a frontend +to <em>git-diff</em> and accepts the same options and arguments.</p></div> +</div> +<h2 id="_options">OPTIONS</h2> +<div class="sectionbody"> +<div class="vlist"><dl> +<dt> +-y +</dt> +<dt> +--no-prompt +</dt> +<dd> +<p> + Do not prompt before launching a diff tool. +</p> +</dd> +<dt> +--prompt +</dt> +<dd> +<p> + Prompt before each invocation of the diff tool. + This is the default behaviour; the option is provided to + override any configuration settings. +</p> +</dd> +<dt> +-t <tool> +</dt> +<dt> +--tool=<tool> +</dt> +<dd> +<p> + Use the diff tool specified by <tool>. + Valid merge tools are: + kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, + ecmerge, diffuse and opendiff +</p> +<div class="para"><p>If a diff tool is not specified, <em>git-difftool</em> +will use the configuration variable <tt>diff.tool</tt>. If the +configuration variable <tt>diff.tool</tt> is not set, <em>git-difftool</em> +will pick a suitable default.</p></div> +<div class="para"><p>You can explicitly provide a full path to the tool by setting the +configuration variable <tt>difftool.<tool>.path</tt>. For example, you +can configure the absolute path to kdiff3 by setting +<tt>difftool.kdiff3.path</tt>. Otherwise, <em>git-difftool</em> assumes the +tool is available in PATH.</p></div> +<div class="para"><p>Instead of running one of the known diff tools, +<em>git-difftool</em> can be customized to run an alternative program +by specifying the command line to invoke in a configuration +variable <tt>difftool.<tool>.cmd</tt>.</p></div> +<div class="para"><p>When <em>git-difftool</em> is invoked with this tool (either through the +<tt>-t</tt> or <tt>--tool</tt> option or the <tt>diff.tool</tt> configuration variable) +the configured command line will be invoked with the following +variables available: <tt>$LOCAL</tt> is set to the name of the temporary +file containing the contents of the diff pre-image and <tt>$REMOTE</tt> +is set to the name of the temporary file containing the contents +of the diff post-image. <tt>$BASE</tt> is provided for compatibility +with custom merge tool commands and has the same value as <tt>$LOCAL</tt>.</p></div> +</dd> +</dl></div> +<div class="para"><p>See <a href="git-diff.html">git-diff(1)</a> for the full list of supported options.</p></div> +</div> +<h2 id="_config_variables">CONFIG VARIABLES</h2> +<div class="sectionbody"> +<div class="para"><p><em>git-difftool</em> falls back to <em>git-mergetool</em> config variables when the +difftool equivalents have not been defined.</p></div> +<div class="vlist"><dl> +<dt> +diff.tool +</dt> +<dd> +<p> + The default diff tool to use. +</p> +</dd> +<dt> +difftool.<tool>.path +</dt> +<dd> +<p> + Override the path for the given tool. This is useful in case + your tool is not in the PATH. +</p> +</dd> +<dt> +difftool.<tool>.cmd +</dt> +<dd> +<p> + Specify the command to invoke the specified diff tool. +</p> +<div class="para"><p>See the <tt>--tool=<tool></tt> option above for more details.</p></div> +</dd> +<dt> +difftool.prompt +</dt> +<dd> +<p> + Prompt before each invocation of the diff tool. +</p> +</dd> +</dl></div> +</div> +<h2 id="_see_also">SEE ALSO</h2> +<div class="sectionbody"> +<div class="vlist"><dl> +<dt> +<a href="git-diff.html">git-diff(1)</a> +</dt> +<dd> +<p> + Show changes between commits, commit and working tree, etc +</p> +</dd> +<dt> +<a href="git-mergetool.html">git-mergetool(1)</a> +</dt> +<dd> +<p> + Run merge conflict resolution tools to resolve merge conflicts +</p> +</dd> +<dt> +<a href="git-config.html">git-config(1)</a> +</dt> +<dd> +<p> + Get and set repository or global options +</p> +</dd> +</dl></div> +</div> +<h2 id="_author">AUTHOR</h2> +<div class="sectionbody"> +<div class="para"><p>Written by David Aguilar <davvid@gmail.com>.</p></div> +</div> +<h2 id="_documentation">Documentation</h2> +<div class="sectionbody"> +<div class="para"><p>Documentation by David Aguilar and the git-list <git@vger.kernel.org>.</p></div> +</div> +<h2 id="_git">GIT</h2> +<div class="sectionbody"> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +</div> +<div id="footer"> +<div id="footer-text"> +Last updated 2009-04-18 06:17:31 UTC +</div> +</div> +</body> +</html> diff --git a/git-difftool.txt b/git-difftool.txt new file mode 100644 index 0000000..15b247b --- /dev/null +++ b/git-difftool.txt
@@ -0,0 +1,105 @@ +git-difftool(1) +=============== + +NAME +---- +git-difftool - Show changes using common diff tools + +SYNOPSIS +-------- +'git difftool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<'git diff' options>] + +DESCRIPTION +----------- +'git-difftool' is a git command that allows you to compare and edit files +between revisions using common diff tools. 'git difftool' is a frontend +to 'git-diff' and accepts the same options and arguments. + +OPTIONS +------- +-y:: +--no-prompt:: + Do not prompt before launching a diff tool. + +--prompt:: + Prompt before each invocation of the diff tool. + This is the default behaviour; the option is provided to + override any configuration settings. + +-t <tool>:: +--tool=<tool>:: + Use the diff tool specified by <tool>. + Valid merge tools are: + kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, + ecmerge, diffuse and opendiff ++ +If a diff tool is not specified, 'git-difftool' +will use the configuration variable `diff.tool`. If the +configuration variable `diff.tool` is not set, 'git-difftool' +will pick a suitable default. ++ +You can explicitly provide a full path to the tool by setting the +configuration variable `difftool.<tool>.path`. For example, you +can configure the absolute path to kdiff3 by setting +`difftool.kdiff3.path`. Otherwise, 'git-difftool' assumes the +tool is available in PATH. ++ +Instead of running one of the known diff tools, +'git-difftool' can be customized to run an alternative program +by specifying the command line to invoke in a configuration +variable `difftool.<tool>.cmd`. ++ +When 'git-difftool' is invoked with this tool (either through the +`-t` or `--tool` option or the `diff.tool` configuration variable) +the configured command line will be invoked with the following +variables available: `$LOCAL` is set to the name of the temporary +file containing the contents of the diff pre-image and `$REMOTE` +is set to the name of the temporary file containing the contents +of the diff post-image. `$BASE` is provided for compatibility +with custom merge tool commands and has the same value as `$LOCAL`. + +See linkgit:git-diff[1] for the full list of supported options. + +CONFIG VARIABLES +---------------- +'git-difftool' falls back to 'git-mergetool' config variables when the +difftool equivalents have not been defined. + +diff.tool:: + The default diff tool to use. + +difftool.<tool>.path:: + Override the path for the given tool. This is useful in case + your tool is not in the PATH. + +difftool.<tool>.cmd:: + Specify the command to invoke the specified diff tool. ++ +See the `--tool=<tool>` option above for more details. + +difftool.prompt:: + Prompt before each invocation of the diff tool. + +SEE ALSO +-------- +linkgit:git-diff[1]:: + Show changes between commits, commit and working tree, etc + +linkgit:git-mergetool[1]:: + Run merge conflict resolution tools to resolve merge conflicts + +linkgit:git-config[1]:: + Get and set repository or global options + + +AUTHOR +------ +Written by David Aguilar <davvid@gmail.com>. + +Documentation +-------------- +Documentation by David Aguilar and the git-list <git@vger.kernel.org>. + +GIT +--- +Part of the linkgit:git[1] suite
diff --git a/git-for-each-ref.html b/git-for-each-ref.html index eca8807..b6629c2 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html
@@ -422,6 +422,8 @@ <p> The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short name of the ref append <tt>:short</tt>. + The option core.warnAmbiguousRefs is used to select the strict + abbreviation mode. </p> </dd> <dt> @@ -564,7 +566,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-13 02:39:29 UTC +Last updated 2009-04-18 06:17:31 UTC </div> </div> </body>
diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt index b362e9e..8dc873f 100644 --- a/git-for-each-ref.txt +++ b/git-for-each-ref.txt
@@ -75,6 +75,8 @@ refname:: The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short name of the ref append `:short`. + The option core.warnAmbiguousRefs is used to select the strict + abbreviation mode. objecttype:: The type of the object (`blob`, `tree`, `commit`, `tag`).
diff --git a/git-merge.html b/git-merge.html index c4100b2..7807ba1 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -630,7 +630,8 @@ <p> Controls which merge resolution program is used by <a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3", - "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and + "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", + "diffuse", "ecmerge", "tortoisemerge", and "opendiff". Any other value is treated is custom merge tool and there must be a corresponding mergetool.<tool>.cmd option. </p> @@ -920,7 +921,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-02 06:49:58 UTC +Last updated 2009-04-18 06:17:32 UTC </div> </div> </body>
diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html new file mode 100644 index 0000000..03c36c0 --- /dev/null +++ b/git-mergetool--lib.html
@@ -0,0 +1,395 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> +<style type="text/css"> +/* Debug borders */ +p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { +/* + border: 1px solid red; +*/ +} + +body { + margin: 1em 5% 1em 5%; +} + +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} + +em { + font-style: italic; +} + +strong { + font-weight: bold; +} + +tt { + color: navy; +} + +h1, h2, h3, h4, h5, h6 { + color: #527bbd; + font-family: sans-serif; + margin-top: 1.2em; + margin-bottom: 0.5em; + line-height: 1.3; +} + +h1, h2, h3 { + border-bottom: 2px solid silver; +} +h2 { + padding-top: 0.5em; +} +h3 { + float: left; +} +h3 + * { + clear: left; +} + +div.sectionbody { + font-family: serif; + margin-left: 0; +} + +hr { + border: 1px solid silver; +} + +p { + margin-top: 0.5em; + margin-bottom: 0.5em; +} + +pre { + padding: 0; + margin: 0; +} + +span#author { + color: #527bbd; + font-family: sans-serif; + font-weight: bold; + font-size: 1.1em; +} +span#email { +} +span#revision { + font-family: sans-serif; +} + +div#footer { + font-family: sans-serif; + font-size: small; + border-top: 2px solid silver; + padding-top: 0.5em; + margin-top: 4.0em; +} +div#footer-text { + float: left; + padding-bottom: 0.5em; +} +div#footer-badges { + float: right; + padding-bottom: 0.5em; +} + +div#preamble, +div.tableblock, div.imageblock, div.exampleblock, div.verseblock, +div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, +div.admonitionblock { + margin-right: 10%; + margin-top: 1.5em; + margin-bottom: 1.5em; +} +div.admonitionblock { + margin-top: 2.5em; + margin-bottom: 2.5em; +} + +div.content { /* Block element content. */ + padding: 0; +} + +/* Block element titles. */ +div.title, caption.title { + font-family: sans-serif; + font-weight: bold; + text-align: left; + margin-top: 1.0em; + margin-bottom: 0.5em; +} +div.title + * { + margin-top: 0; +} + +td div.title:first-child { + margin-top: 0.0em; +} +div.content div.title:first-child { + margin-top: 0.0em; +} +div.content + div.title { + margin-top: 0.0em; +} + +div.sidebarblock > div.content { + background: #ffffee; + border: 1px solid silver; + padding: 0.5em; +} + +div.listingblock { + margin-right: 0%; +} +div.listingblock > div.content { + border: 1px solid silver; + background: #f4f4f4; + padding: 0.5em; +} + +div.quoteblock > div.content { + padding-left: 2.0em; +} + +div.attribution { + text-align: right; +} +div.verseblock + div.attribution { + text-align: left; +} + +div.admonitionblock .icon { + vertical-align: top; + font-size: 1.1em; + font-weight: bold; + text-decoration: underline; + color: #527bbd; + padding-right: 0.5em; +} +div.admonitionblock td.content { + padding-left: 0.5em; + border-left: 2px solid silver; +} + +div.exampleblock > div.content { + border-left: 2px solid silver; + padding: 0.5em; +} + +div.verseblock div.content { + white-space: pre; +} + +div.imageblock div.content { padding-left: 0; } +div.imageblock img { border: 1px solid silver; } +span.image img { border-style: none; } + +dl { + margin-top: 0.8em; + margin-bottom: 0.8em; +} +dt { + margin-top: 0.5em; + margin-bottom: 0; + font-style: italic; +} +dd > *:first-child { + margin-top: 0; +} + +ul, ol { + list-style-position: outside; +} +div.olist2 ol { + list-style-type: lower-alpha; +} + +div.tableblock > table { + border: 3px solid #527bbd; +} +thead { + font-family: sans-serif; + font-weight: bold; +} +tfoot { + font-weight: bold; +} + +div.hlist { + margin-top: 0.8em; + margin-bottom: 0.8em; +} +div.hlist td { + padding-bottom: 5px; +} +td.hlist1 { + vertical-align: top; + font-style: italic; + padding-right: 0.8em; +} +td.hlist2 { + vertical-align: top; +} + +@media print { + div#footer-badges { display: none; } +} + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] +/* Workarounds for IE6's broken and incomplete CSS2. */ + +div.sidebar-content { + background: #ffffee; + border: 1px solid silver; + padding: 0.5em; +} +div.sidebar-title, div.image-title { + font-family: sans-serif; + font-weight: bold; + margin-top: 0.0em; + margin-bottom: 0.5em; +} + +div.listingblock div.content { + border: 1px solid silver; + background: #f4f4f4; + padding: 0.5em; +} + +div.quoteblock-content { + padding-left: 2.0em; +} + +div.exampleblock-content { + border-left: 2px solid silver; + padding-left: 0.5em; +} + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } +</style> +<title>git-mergetool--lib(1)</title> +</head> +<body> +<div id="header"> +<h1> +git-mergetool--lib(1) Manual Page +</h1> +<h2>NAME</h2> +<div class="sectionbody"> +<p>git-mergetool--lib - + Common git merge tool shell scriptlets +</p> +</div> +</div> +<h2>SYNOPSIS</h2> +<div class="sectionbody"> +<div class="para"><p><em>TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"</em></p></div> +</div> +<h2 id="_description">DESCRIPTION</h2> +<div class="sectionbody"> +<div class="para"><p>This is not a command the end user would want to run. Ever. +This documentation is meant for people who are studying the +Porcelain-ish scripts and/or are writing new ones.</p></div> +<div class="para"><p>The <em>git-mergetool--lib</em> scriptlet is designed to be sourced (using +<tt>.</tt>) by other shell scripts to set up functions for working +with git merge tools.</p></div> +<div class="para"><p>Before sourcing <em>git-mergetool--lib</em>, your script must set <tt>TOOL_MODE</tt> +to define the operation mode for the functions listed below. +<em>diff</em> and <em>merge</em> are valid values.</p></div> +</div> +<h2 id="_functions">FUNCTIONS</h2> +<div class="sectionbody"> +<div class="vlist"><dl> +<dt> +get_merge_tool +</dt> +<dd> +<p> + returns a merge tool. +</p> +</dd> +<dt> +get_merge_tool_cmd +</dt> +<dd> +<p> + returns the custom command for a merge tool. +</p> +</dd> +<dt> +get_merge_tool_path +</dt> +<dd> +<p> + returns the custom path for a merge tool. +</p> +</dd> +<dt> +run_merge_tool +</dt> +<dd> +<p> + launches a merge tool given the tool name and a true/false + flag to indicate whether a merge base is present. + <em>$MERGED</em>, <em>$LOCAL</em>, <em>$REMOTE</em>, and <em>$BASE</em> must be defined + for use by the merge tool. +</p> +</dd> +</dl></div> +</div> +<h2 id="_author">Author</h2> +<div class="sectionbody"> +<div class="para"><p>Written by David Aguilar <davvid@gmail.com></p></div> +</div> +<h2 id="_documentation">Documentation</h2> +<div class="sectionbody"> +<div class="para"><p>Documentation by David Aguilar and the git-list <git@vger.kernel.org>.</p></div> +</div> +<h2 id="_git">GIT</h2> +<div class="sectionbody"> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +</div> +<div id="footer"> +<div id="footer-text"> +Last updated 2009-04-18 06:17:31 UTC +</div> +</div> +</body> +</html> diff --git a/git-mergetool--lib.txt b/git-mergetool--lib.txt new file mode 100644 index 0000000..78eb03f --- /dev/null +++ b/git-mergetool--lib.txt
@@ -0,0 +1,54 @@ +git-mergetool--lib(1) +===================== + +NAME +---- +git-mergetool--lib - Common git merge tool shell scriptlets + +SYNOPSIS +-------- +'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"' + +DESCRIPTION +----------- + +This is not a command the end user would want to run. Ever. +This documentation is meant for people who are studying the +Porcelain-ish scripts and/or are writing new ones. + +The 'git-mergetool--lib' scriptlet is designed to be sourced (using +`.`) by other shell scripts to set up functions for working +with git merge tools. + +Before sourcing 'git-mergetool--lib', your script must set `TOOL_MODE` +to define the operation mode for the functions listed below. +'diff' and 'merge' are valid values. + +FUNCTIONS +--------- +get_merge_tool:: + returns a merge tool. + +get_merge_tool_cmd:: + returns the custom command for a merge tool. + +get_merge_tool_path:: + returns the custom path for a merge tool. + +run_merge_tool:: + launches a merge tool given the tool name and a true/false + flag to indicate whether a merge base is present. + '$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined + for use by the merge tool. + +Author +------ +Written by David Aguilar <davvid@gmail.com> + +Documentation +-------------- +Documentation by David Aguilar and the git-list <git@vger.kernel.org>. + +GIT +--- +Part of the linkgit:git[1] suite
diff --git a/git-mergetool.html b/git-mergetool.html index e884caf..572031a 100644 --- a/git-mergetool.html +++ b/git-mergetool.html
@@ -344,7 +344,8 @@ <p> Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, + diffuse, tortoisemerge and opendiff </p> <div class="para"><p>If a merge resolution program is not specified, <em>git-mergetool</em> will use the configuration variable <tt>merge.tool</tt>. If the @@ -413,7 +414,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-02 06:49:57 UTC +Last updated 2009-04-18 06:17:32 UTC </div> </div> </body>
diff --git a/git-mergetool.txt b/git-mergetool.txt index 5d3c632..ff9700d 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt
@@ -26,7 +26,8 @@ --tool=<tool>:: Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, + diffuse, tortoisemerge and opendiff + If a merge resolution program is not specified, 'git-mergetool' will use the configuration variable `merge.tool`. If the
diff --git a/git-rev-parse.html b/git-rev-parse.html index f26eeba..7e6983d 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html
@@ -463,6 +463,16 @@ </p> </dd> <dt> +--abbrev-ref[={strict|loose}] +</dt> +<dd> +<p> + A non-ambiguous short name of the objects name. + The option core.warnAmbiguousRefs is used to select the strict + abbreviation mode. +</p> +</dd> +<dt> --all </dt> <dd> @@ -980,7 +990,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-02 06:50:02 UTC +Last updated 2009-04-18 06:17:32 UTC </div> </div> </body> diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 5ed2bc8..fba30b1 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt
@@ -84,6 +84,11 @@ unfortunately named tag "master"), and show them as full refnames (e.g. "refs/heads/master"). +--abbrev-ref[={strict|loose}]:: + A non-ambiguous short name of the objects name. + The option core.warnAmbiguousRefs is used to select the strict + abbreviation mode. + --all:: Show all refs found in `$GIT_DIR/refs`. diff --git a/git-shell.html b/git-shell.html index 608dc51..f6bc57b 100644 --- a/git-shell.html +++ b/git-shell.html
@@ -329,9 +329,9 @@ of server-side GIT commands implementing the pull/push functionality. The commands can be executed only by the <em>-c</em> option; the shell is not interactive.</p></div> -<div class="para"><p>Currently, only three commands are permitted to be called, <em>git-receive-pack</em> -<em>git-upload-pack</em> with a single required argument or <em>cvs server</em> (to invoke -<em>git-cvsserver</em>).</p></div> +<div class="para"><p>Currently, only four commands are permitted to be called, <em>git-receive-pack</em> +<em>git-upload-pack</em> and <em>git-upload-archive</em> with a single required argument, or +<em>cvs server</em> (to invoke <em>git-cvsserver</em>).</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> @@ -347,7 +347,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-02 06:50:04 UTC +Last updated 2009-04-18 06:17:32 UTC </div> </div> </body>
diff --git a/git-shell.txt b/git-shell.txt index 3f8d973..0f3ad81 100644 --- a/git-shell.txt +++ b/git-shell.txt
@@ -18,9 +18,9 @@ The commands can be executed only by the '-c' option; the shell is not interactive. -Currently, only three commands are permitted to be called, 'git-receive-pack' -'git-upload-pack' with a single required argument or 'cvs server' (to invoke -'git-cvsserver'). +Currently, only four commands are permitted to be called, 'git-receive-pack' +'git-upload-pack' and 'git-upload-archive' with a single required argument, or +'cvs server' (to invoke 'git-cvsserver'). Author ------
diff --git a/git.html b/git.html index 3b9b03c..18121e9 100644 --- a/git.html +++ b/git.html
@@ -903,6 +903,14 @@ </p> </dd> <dt> +<a href="git-difftool.html">git-difftool(1)</a> +</dt> +<dd> +<p> + Show changes using common diff tools. +</p> +</dd> +<dt> <a href="git-fsck.html">git-fsck(1)</a> </dt> <dd> @@ -2034,7 +2042,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-13 02:39:29 UTC +Last updated 2009-04-18 06:17:33 UTC </div> </div> </body>
diff --git a/gitattributes.html b/gitattributes.html index 57047c7..8b7280c 100644 --- a/gitattributes.html +++ b/gitattributes.html
@@ -619,7 +619,8 @@ </div></div> <div class="para"><p>Then, you would define a "diff.tex.xfuncname" configuration to specify a regular expression that matches a line that you would -want to appear as the hunk header "TEXT", like this:</p></div> +want to appear as the hunk header "TEXT". Add a section to your +<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[diff "tex"] @@ -693,7 +694,8 @@ in the "diff.*.wordRegex" configuration variable. For example, in TeX a backslash followed by a sequence of letters forms a command, but several such commands can be run together without intervening -whitespace. To separate them, use a regular expression such as</p></div> +whitespace. To separate them, use a regular expression in your +<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[diff "tex"] @@ -714,7 +716,8 @@ resulting text on stdout.</p></div> <div class="para"><p>For example, to show the diff of the exif information of a file instead of the binary information (assuming you have the -exif tool installed):</p></div> +exif tool installed), add the following section to your +<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file):</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[diff "jpg"] @@ -1020,7 +1023,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-08 07:36:13 UTC +Last updated 2009-04-18 06:17:33 UTC </div> </div> </body>
diff --git a/gitattributes.txt b/gitattributes.txt index b762bba..aaa073e 100644 --- a/gitattributes.txt +++ b/gitattributes.txt
@@ -297,7 +297,8 @@ Then, you would define a "diff.tex.xfuncname" configuration to specify a regular expression that matches a line that you would -want to appear as the hunk header "TEXT", like this: +want to appear as the hunk header "TEXT". Add a section to your +`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: ------------------------ [diff "tex"] @@ -345,7 +346,8 @@ in the "diff.*.wordRegex" configuration variable. For example, in TeX a backslash followed by a sequence of letters forms a command, but several such commands can be run together without intervening -whitespace. To separate them, use a regular expression such as +whitespace. To separate them, use a regular expression in your +`$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: ------------------------ [diff "tex"] @@ -373,7 +375,8 @@ For example, to show the diff of the exif information of a file instead of the binary information (assuming you have the -exif tool installed): +exif tool installed), add the following section to your +`$GIT_DIR/config` file (or `$HOME/.gitconfig` file): ------------------------ [diff "jpg"]
diff --git a/merge-config.txt b/merge-config.txt index 1ff08ff..4832bc7 100644 --- a/merge-config.txt +++ b/merge-config.txt
@@ -22,7 +22,8 @@ merge.tool:: Controls which merge resolution program is used by linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3", - "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and + "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", + "diffuse", "ecmerge", "tortoisemerge", and "opendiff". Any other value is treated is custom merge tool and there must be a corresponding mergetool.<tool>.cmd option.
